From: Matthieu Gallien Date: Fri, 9 May 2025 13:07:25 +0000 (+0200) Subject: feat(windows): use cmake to configure windows integration DLL version X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1^2~13^2~1^2~34^2~3 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4a5e31d89d5dcdd073628e1f994e28d79f227af3;p=nextcloud-desktop.git feat(windows): use cmake to configure windows integration DLL version Signed-off-by: Matthieu Gallien --- diff --git a/shell_integration/windows/NCUtil/CMakeLists.txt b/shell_integration/windows/NCUtil/CMakeLists.txt index fa75e1593..1b5610253 100644 --- a/shell_integration/windows/NCUtil/CMakeLists.txt +++ b/shell_integration/windows/NCUtil/CMakeLists.txt @@ -7,5 +7,6 @@ add_library(NCUtil STATIC target_include_directories(NCUtil PUBLIC - "${CMAKE_CURRENT_SOURCE_DIR}" + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ) diff --git a/shell_integration/windows/NCUtil/Version.h b/shell_integration/windows/NCUtil/Version.h deleted file mode 100644 index 365156919..000000000 --- a/shell_integration/windows/NCUtil/Version.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -// This is the number that will end up in the version window of the DLLs. -// Increment this version before committing a new build if you are today's shell_integration build master. -#define NCEXT_BUILD_NUM 47 - -#define STRINGIZE2(s) #s -#define STRINGIZE(s) STRINGIZE2(s) - -#define NCEXT_VERSION 3,0,0,NCEXT_BUILD_NUM -#define NCEXT_VERSION_STRING STRINGIZE(NCEXT_VERSION) diff --git a/shell_integration/windows/NCUtil/Version.h.in b/shell_integration/windows/NCUtil/Version.h.in new file mode 100644 index 000000000..eb97edb91 --- /dev/null +++ b/shell_integration/windows/NCUtil/Version.h.in @@ -0,0 +1,11 @@ +#pragma once + +// This is the number that will end up in the version window of the DLLs. +// Increment this version before committing a new build if you are today's shell_integration build master. +#cmakedefine NCEXT_BUILD_NUM @NCEXT_BUILD_NUM@ + +#define STRINGIZE2(s) #s +#define STRINGIZE(s) STRINGIZE2(s) + +#cmakedefine NCEXT_VERSION @NCEXT_VERSION@ +#define NCEXT_VERSION_STRING STRINGIZE(NCEXT_VERSION)